From 2dd26502156203ff6ef719035adcd15df8ad9d8b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Tue, 2 Mar 2010 18:24:21 +0100 Subject: [PATCH] Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_NO_SHOW_ALL) --- gtk/gtkwidget.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index fc4ee1709a..c296c3f3b0 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3339,7 +3339,7 @@ gtk_widget_show_all (GtkWidget *widget) g_return_if_fail (GTK_IS_WIDGET (widget)); - if ((GTK_WIDGET_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0) + if (gtk_widget_get_no_show_all (widget)) return; class = GTK_WIDGET_GET_CLASS (widget); @@ -3361,7 +3361,7 @@ gtk_widget_hide_all (GtkWidget *widget) g_return_if_fail (GTK_IS_WIDGET (widget)); - if ((GTK_WIDGET_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0) + if (gtk_widget_get_no_show_all (widget)) return; class = GTK_WIDGET_GET_CLASS (widget); @@ -10954,7 +10954,7 @@ gtk_widget_get_no_show_all (GtkWidget *widget) { g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); - return (GTK_WIDGET_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0; + return (GTK_OBJECT_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0; } /** @@ -10979,13 +10979,13 @@ gtk_widget_set_no_show_all (GtkWidget *widget, no_show_all = (no_show_all != FALSE); - if (no_show_all == ((GTK_WIDGET_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0)) + if (no_show_all == gtk_widget_get_no_show_all (widget)) return; if (no_show_all) - GTK_WIDGET_SET_FLAGS (widget, GTK_NO_SHOW_ALL); + GTK_OBJECT_FLAGS (widget) |= GTK_NO_SHOW_ALL; else - GTK_WIDGET_UNSET_FLAGS (widget, GTK_NO_SHOW_ALL); + GTK_OBJECT_FLAGS (widget) &= ~(GTK_NO_SHOW_ALL); g_object_notify (G_OBJECT (widget), "no-show-all"); } -- 2.30.2